diff --git a/web/assets.js b/web/assets.js --- a/web/assets.js +++ b/web/assets.js @@ -3,21 +3,29 @@ export const assetCacheURLPrefix = 'https://dh9fld3hutpxf.cloudfront.net'; // Background Illustration -export const backgroundIllustrationFileName = 'background-illustration.svg'; -export const backgroundIllustrationHeight = '100px'; -export const backgroundIllustrationWidth = '133px'; +export const backgroundIllustrationAsset = { + fileName: 'background-illustration.svg', + height: '100px', + width: '133px', +}; // Notifications Modal Illustration: "Focused" -export const focusedNotificationsIllustrationFileName = 'all-notifs.svg'; -export const focusedNotificationsIllustrationHeight = '86px'; -export const focusedNotificationsIllustrationWidth = '46px'; +export const focusedNotificationsIllustrationAsset = { + fileName: 'all-notifs.svg', + height: '86px', + width: '46px', +}; // Notifications Modal Illustration: "Focused (badge only)" -export const badgeOnlyNotificationsIllustrationFileName = 'badge-notifs.svg'; -export const badgeOnlyNotificationsIllustrationHeight = '86px'; -export const badgeOnlyNotificationsIllustrationWidth = '46px'; +export const badgeOnlyNotificationsIllustrationAsset = { + fileName: 'badge-notifs.svg', + height: '86px', + width: '46px', +}; // Notifications Modal Illustration: "Background" -export const backgroundNotificationsIllustrationFileName = 'muted-notifs.svg'; -export const backgroundNotificationsIllustrationHeight = '86px'; -export const backgroundNotificationsIllustrationWidth = '46px'; +export const backgroundNotificationsIllustrationAsset = { + fileName: 'muted-notifs.svg', + height: '86px', + width: '46px', +}; diff --git a/web/chat/chat-thread-list.react.js b/web/chat/chat-thread-list.react.js --- a/web/chat/chat-thread-list.react.js +++ b/web/chat/chat-thread-list.react.js @@ -5,12 +5,7 @@ import { emptyItemText } from 'lib/shared/thread-utils'; -import { - assetCacheURLPrefix, - backgroundIllustrationFileName, - backgroundIllustrationHeight, - backgroundIllustrationWidth, -} from '../assets'; +import { assetCacheURLPrefix, backgroundIllustrationAsset } from '../assets'; import Search from '../components/search.react'; import ChatThreadListItem from './chat-thread-list-item.react'; import css from './chat-thread-list.css'; @@ -56,9 +51,9 @@ return (
{emptyItemText}
diff --git a/web/modals/threads/notifications/notifications-modal.react.js b/web/modals/threads/notifications/notifications-modal.react.js --- a/web/modals/threads/notifications/notifications-modal.react.js +++ b/web/modals/threads/notifications/notifications-modal.react.js @@ -14,15 +14,9 @@ import { assetCacheURLPrefix, - backgroundNotificationsIllustrationFileName, - backgroundNotificationsIllustrationHeight, - backgroundNotificationsIllustrationWidth, - badgeOnlyNotificationsIllustrationFileName, - badgeOnlyNotificationsIllustrationHeight, - badgeOnlyNotificationsIllustrationWidth, - focusedNotificationsIllustrationFileName, - focusedNotificationsIllustrationHeight, - focusedNotificationsIllustrationWidth, + focusedNotificationsIllustrationAsset, + badgeOnlyNotificationsIllustrationAsset, + backgroundNotificationsIllustrationAsset, } from '../../../assets.js'; import Button from '../../../components/button.react'; import EnumSettingsOption from '../../../components/enum-settings-option.react'; @@ -79,9 +73,9 @@ ]; const icon = ( ); return ( @@ -104,9 +98,9 @@ ]; const icon = ( ); return ( @@ -129,9 +123,9 @@ ]; const icon = ( ); return (